From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Wed, 11 Sep 2013 00:40:24 +0000 (-0400)
Subject: workspacesView: Don't double-destroy workspaces
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~3459
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=f8234b07f8f03d2db48841fa64ab3a10040491b7;p=gnome-shell.git

workspacesView: Don't double-destroy workspaces

The WorkspaceView actors contain the Workspace actors, so destroying the
WorkspaceView actors should be enough.

https://bugzilla.gnome.org/show_bug.cgi?id=707889
---

diff --git a/js/ui/workspacesView.js b/js/ui/workspacesView.js
index 50f079c3e..f4de48b14 100644
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@@ -540,12 +540,6 @@ const WorkspacesDisplay = new Lang.Class({
         for (let i = 0; i < this._workspacesViews.length; i++)
             this._workspacesViews[i].destroy();
         this._workspacesViews = [];
-
-        for (let i = 0; i < this._workspaces.length; i++)
-            for (let w = 0; w < this._workspaces[i].length; w++) {
-                this._workspaces[i][w].disconnectAll();
-                this._workspaces[i][w].destroy();
-            }
     },
 
     _workspacesOnlyOnPrimaryChanged: function() {
@@ -561,10 +555,6 @@ const WorkspacesDisplay = new Lang.Class({
         for (let i = 0; i < this._workspacesViews.length; i++)
             this._workspacesViews[i].destroy();
 
-        for (let i = 0; i < this._workspaces.length; i++)
-            for (let w = 0; w < this._workspaces[i].length; w++)
-                this._workspaces[i][w].destroy();
-
         this._workspacesViews = [];
         this._workspaces = [];
         let monitors = Main.layoutManager.monitors;